ps1: gpu: Ensure hi >= lo when calling std::clamp() #1851
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thentenaar
force-pushed
the
ps1-gpu-clamp-fix
branch
from
72cd3b8 to
e50f480
Compare
|
There's probably a more correct solution to this but it'l d for now to avoid the crash; sorry for the delay, I meant to investigate further but did not find the time just yet. |
|
Just an aside, definitely not a fan of the macro function usage. Better would probably be something like: constexpr auto clip = [](auto x, auto lo, auto hi) {
return std::clamp((x), (((lo) <= (hi)) ? (lo) : (hi)), (((hi) >= (lo)) ? (hi) : (lo)));
};Which is not only actually debuggable and devoid of macro side effects, but would also give you the ability to do things at compile time like static_assert(clip(3, 1, 2) == 2);
static_assert(clip(1, 2, 3) == 2);
static_assert(clip(2, 1, 3) == 2);Since it's localized here and maybe likely to be rewritten, I guess it's not terribly consequential, but it would be definitely be nicer if we take advantage of modern language features like this instead of macro functions in general in the future, I guess. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On Lunar Disc 1, when entering Berg (about two minutes in,) going into Alex's house or the barn to the right of it, winds up causing an assertion failure in std::clamp() on the screen transition. Could be a bug in the game where it sends the 0xe3/0xe4 coords in the wrong order, or if it's off by one calculating them. Not sure if the real hardware ignores it or does anything in particular as a result.
Adding some print() calls in
GPU::Render::triangle()before the clamp, I see:Thus, this patch ensures
hi >= lo.